Merge "Snap for 12779445 from 854f867f2d2d3249db4244703965d146570e59dd to sdk-release" into sdk-release